From 1765b01024575ea0c72d3aec314334fbaa4c83ea Mon Sep 17 00:00:00 2001 From: "vhanquez@kneesa.uk.xensource.com" Date: Mon, 16 Jan 2006 21:43:17 +0000 Subject: [PATCH] use standard pr_debug macro for DPRINTK. Signed-off-by: Vincent Hanquez --- linux-2.6-xen-sparse/drivers/xen/blkback/common.h | 8 ++------ linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h index 406e6d9470..2576664e7c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h @@ -19,12 +19,8 @@ #include #include -#if 0 -#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \ - __FILE__ , __LINE__ , ## _a ) -#else -#define DPRINTK(_f, _a...) ((void)0) -#endif +#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \ + __FILE__ , __LINE__ , ## _a ) struct vbd { blkif_vdev_t handle; /* what the domain refers to this vbd as */ diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c index f3a0287935..486dcf9883 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c @@ -24,12 +24,9 @@ #include #include "common.h" - -#if 0 #undef DPRINTK #define DPRINTK(fmt, args...) \ - printk("blkback/xenbus (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args) -#endif + pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args) struct backend_info -- 2.30.2